Add container and cache type to HTML and TEXT outputs.

diff --git a/html.c b/html.c
index dd725ffac000c7f7f7dad5d2be4c27a277020c0c..fe0b2d765a343fd2c5f8026f3fed388cb314b29c 100644 (file)
--- a/html.c
+++ b/html.c
@@ -104,6 +104,10 @@ html_disp(const waypoint *wpt)
        }
        fprintf(file_out, "</h3>\n");
        if (wpt->gc_data.terr) {
+               fprintf(file_out, "<p class=\"cachetype\">%s</p>\n", 
+                       gs_get_cachetype(wpt->gc_data.type), gs_get_container(wpt->gc_data.container));
+               fprintf(file_out, "<p class=\"cachecontainer\">%s</>\n", 
+                       gs_get_container(wpt->gc_data.container));
                if (wpt->gc_data.desc_short.utfstring) {
                        char *tmpstr = strip_nastyhtml(wpt->gc_data.desc_short.utfstring);
                        fprintf (file_out, "<p class=\"descshort\">%s</p>\n", tmpstr );

diff --git a/text.c b/text.c
index d1a405e2a1d0bcc3a9297787be1530c4b82ece7a..734a6d71fffe8c9abc7256ac12d5b5ecd422bb10 100644 (file)
--- a/text.c
+++ b/text.c
@@ -94,6 +94,8 @@ text_disp(const waypoint *wpt)
                fprintf(file_out, "%s\n", wpt->description);
        }
        if (wpt->gc_data.terr) {
+               fprintf(file_out, "%s/%s\n", 
+                       gs_get_cachetype(wpt->gc_data.type), gs_get_container(wpt->gc_data.container));
                if (wpt->gc_data.desc_short.utfstring) {
                        char *stripped_html = strip_html(&wpt->gc_data.desc_short);
                        fprintf (file_out, "\n%s\n", stripped_html);